Complete Clubbingspain parser
Simplify function names