Clean up code formatting

Updated whitespace and alignment in file header comments for consistency, and corrected the package name reference.