Cleanup of Initial Code