#More Stuff cleanup
fn cleanup and renaming .. shortened codes