Fixed file formatting and fixed warning from XCode 5