changes for cleaner code