2 o clock in the morning. Too tired to write a commit message. Abstraction enhanced.