Reorganized imports. Sanitized header comments. Reformatted.