Cleaning up
Make private methods private