Force prime pillar on layer without a tool cahnge when pillar set to true. Clean up code for easier maintanence.