Fixed bug in normal calculation and cleaned up Disc.h/Disc.cpp