Clean up, add comments