Fix transitions running on page load
Minor code housekeeping