Added some refactoring suggestions as TODO comments.