Clean up init, improve display and reduce LOC