Code cleanup, and fixed the pause button that broke in coffee port