[10] Cleaned up the code just a bit