Small changes to clean code