mostly constructor optimizations
small parenthsis opps
reduced scope, simplified if statement