Cleared the code a bit