More Code Cleanup / Simplification