clean-up work so netbeans will stop complaining

Changed code according to Netbeans’ complaining