House keeping / code style