WIP, remove comments, formatting