Formatted code and renamed classes