Cleanning up, makeing it easy to run.