Code clean-up (whitespace)