Added extra attributes and some minor changes
Remove unwanted line of emptiness