Cleans code and improves readability