Implemented more of Aron's suggestions.