Cleaned code

made the code easier to read