Remove test line
Tweak some methods