Removed several Code Climate Issues