Clearer code
More code cleared up