Code Improvments
	- Some code refactor