Formatting fixed in classes