Added convenience and cleaned up