Cleaned up my code in preparation