inlined helper methods, got rid of unused errors