Clean up, basic directive already working