Make the code cleaner in layouts