Changed core selection into a variable
Removed space at the end of computed lines