Cleaner Code

Changes to bla bla and bla