Made interface more consistent, removed somewhat silly internal methods