Formatting and added @Override to MetadataListener methods on the controller