Cleaned the code and fixed a few things on the comments.