Minor changes. Cleaning up of the code to make it look better.