Moving things around, adding comments and changing from public to protected