added better organization to file