Code cleanup,  apply use of Nullable and NotNull and some toString cleanup