updated naming convention, formatting