I think it makes perfect sense and it's definitely cleaner. Fixing it (I hope).