Minor - Reformatted code to avoid warnings and consider code sniffer