Fixed up rarest piece
Cleaned up class files