Minor cleanup

Made more minor changes