CodeCleaning

Clean the code to be more orginized