Organizing functions better, taking stuff "private"