Implement suggestions from Prof. Cappos.