Refactored, removed commenting section