clean up code

Code need to be cleaned up to follow naming convention, remove commented out lines and add doc strings for other code readers.