Removed Unnecessary Code, Added new style