Code, comments and label clean up.