Cleanup some redundant declarations

Started cleaning up some redundant declarations from .h files.

Tests are passing, but it would be awesome if @stepanhruda or anyone else could try to run their existing app tests, just to confirm everything works.

Some property accessors are inconsistent, so the next plan is to make a convention for using private properties using self.property.

Also, pragma marks should be oneliners, instead of

``` objc
#pragma mark - 
#pragma mark Something
```