better documentation, removed silly methods