Minor changes and fixed a missing semi-colon