Cleans up code :fire: