Clean up and introduce gulp