Cleaning the code + adding more constants