Refactored for quicker use and better layout