Cleaing up the code, lalala