Modified... Clean it up!