Fluent API cleanup

Build() calls removed, shorter function methods names, some other refactorings