Some cleaning up
Clean up comments/todos