Removes extraneous @'s and adds more refactoring