clean code
sort features