Cleaned up code by removing comments, etc.