Streamlining functionality and still cleaning up my ugly, ugly code!