Updated scala classes with formatting