Clean up post minecraft code a bit more