Code Cleanup

Changed the functions class to be a lot more private