paradisehill code cleanup