minor changes to clean code