Trying to remove constants where possible. Changes not tested due to bad RasPi firmware update and no HDMI device around to check terminal.