Formatted code and renamed files