cleaned up coding style 2