Comments on things to refactor and improve