Minor Errors
Code Cleaning