Cleansed the code a bit