Few changes
Changes in code to look better