Clean up for more Readable Code