Clean Up Modfiers and formatting