Clean up code, remove unnecessary comments