Small simplification
Added some helper methods