cmdZ v0.96: major code cleanup throughout the app
cmdZ v0.96: major code cleanup throughout the app