Fast fix and cleanup

Pewpew