Code clean up and text changes