Worked on Cleaning up code and adding configs