Rename some methods

rename some methods according to its sense
Extract some logic to methods for KISS