Removed replaced classes, straightened comments and formatting