General code cleanup
Add transition effect back in
Stick to official syntax