Doing some changes for proper NetBeans usage.