Updating

Removed duplicate lines, changed styles