minor clean ups

Made some minor clean ups.. Merge this branch