Fixes to follow the coding style guide.

 The following fixes has been made:

   - Removed prefixes like 'i' for new variables

   - Adding braces also for if-clauses with a single statement

   - Removed some trailing spaces

   - Changed variable precedingDRAP in Picture from int to bool