Cleaned code formatting.
Merge remote-tracking branch 'Amir/master'