Fixed issue: Removed not needed constants, fixed profilng
Fixed issue: PSR-2 coding style

+ The keyword elseif SHOULD be used instead of else if so that all control
  keywords look like single words