Refacturing

Variable names and white spaces.