Code clean up.

Clean variable declarations and white spaces.