updated code with new standards. hard set in eclipse so i don't have to
do it again