Improve method argument name
Add FIXME that occurred TypeError caused by Atom
Remove needless methods