Refactored some code. If things breaks now, it's my fault.