Finished style fixes