Some code cleaning

Making readability and formatting consistent.