clean code etc.