Cleaned up trailing class