Syntactic changes and removal of static constructors in phone/

This commit brings more of the same refactoring. I have also started to standardise and typedef enums.