Added default switch, cleaned up comments