Cleanup code & comments