Clean up. Created sub method