Clean up & comments -j