Modernised some code - removed @synthesize statements