minor coding style changes

removing variable parsing, etc.