Yeah.. I'll do refactoring here.. thanks