Misc Code cleanup ("by "Runningaway)