code cleanup for lord travis