Clean code; on to Q4