Enforce style, refactored code, wrap few more methods