Fix #24 for compliance with standards development

 - standard: PSR2, PSR1
 - text codesize
 - unusedcode
 - naming
 - design
Correct id