Refactored more classes, general cleanup