General Maintenance

Added more commenting and cleaned whitespace.