Cleaned up code, prepping for overhaul to address future design considerations.