style refactoring
corrected for iphone