Added some label changes and formatted code