Reviewed changes made by pull request and cleaned everything up.