Added -moz and -o transition syntax, cleaned up code