Tweak
Final cleanup w/ bugfix :D