cleaner and more consistent coding style