put specs under subdir
spec cleanups
less lines
remove unused method