Fixed some copyright comments
Minor refactoring (using this when accessing fields)