Import clean-up; Comments and documentation