Cleans a bit and adds comments for future work.