Cleaned and reorderd setup