some changes as flagged by NetBeans