Cleaned up code and remove redundant comments.