Minor clean code