Cleaned up formatting and comment issues. Removed old code.