Clean up code, privatize more methods