Cleaned up and added reboot method