Added & Fixed code style