Mobile/syntax clean up