more code style/insanity cleanup