Moved some code to outer methods