Code clean-up continues
Moar kode kleenup