Refactored in the latest commit =)