Proper cleaned up stuff xD