Finishing touches for class submission