Some clean code