Code clean up, it's 2014 ffs!