[DOES NOT BUILD] Started cleaning up code