reduce code linecount slightly