Added setters and getters. Lint cleanup.