Fixed more semi-colons, cleaned readability