Include comments & finish styling