Cleaned up code and code comments.