Fixing issues with code format and proper format - thanks @andrewsmedina