Can we cleanup this somehow? It's really unreadeable right now...