Corrected all the mistakes and added a file for constants