Updated code and formatted CSS