coding style changes as suggested in #304