clean code
minor changes