Minor reject fix and code guidelines