Minor code layout changes :)