Code Stylization and Correction (v2)

New code cleanup PR, with the changes that you suggested, @MiguelCastillo.