Refactored the code. No more!