Added some convenience methods
Fixed whitespace bug
Renamed property name