Cleaned up code

Made some things private that should have been