Standardized indentation across files, inserted dummy values so all classes compile, removed test