Combined Code and removed Comment