Basic high-level methods cleaned up and documented