Cleaned and tuned layout