Fixed best practice stuff