Code clean up: round one