Cleaned import and changed some fields from protected to private.