Stopped using __ in names as a prefix
Added enforcement for ; at EOL