Clean up. Add comments