Cleanup & add comments