fixed the names and other styling issues highlighted by Sandeep