Final cleanup

The code is now as clean as it can get