Tweaks; consider 'public:' etc. as keyword