syntax improvements
minor improvements
deprecating helper functions