no, moved to private method. fixed indentation above