[Issue #80][Finished] fixed code conventions.. again