Small Changes.

Code is more clean now.