Make the code look like what we want

Make the code look like what we want #386