Cleaned up excess code and comments.