[issue #79][DONE] fixed 80 chars and code convetions