Cleaned files, Fixed header, Removed imports