Fixing an NPE for sure
minor cleanup