Style improvements, Cleanup