Added options for getters and setters. Style changes