More Polishing

Compiles without any warnings