Cleaned up const & variable names, added comments.