Clean up and adding comments, WIP