Extracted concern specific code

Also the error