Slight improvements: naming convenations and remove needless operations