Added some method documentation and refined some naming