Cleaned up files - tested