Merge "Some code formatting" into lmp-dev