small comments refactor
removed extra spaces
better select code structure (simplified code)