Refactored code, removed stupid comments