[#38] Moved dirty code to helper method