clarified comments above methods, general cleanup