updated naming conventions, improved formatting