naming conventions / code formatting fixes