improved: clean code