Final Code

All the code has been cleaned and is ready to submit