Cleaned the Code

The code has been cleaned in a way that allows a new evaluation module.