Cleanup

Cleanup of JS vars, added transition with proper prefixes