master
Convenience methods and some cleaning