Added public/private declarations and changed non-static things to be private