Tidy push

tidied up code and comments
set default sleep timer to 2 hours.