cleanups from NetBeans inspect & transform suggestions