Cleaned up files (imports, spacing)