Minor fixes: clean code