Imports, comments, and code formatting, once again (minor)