code clean up
(more methods)