Fixed style conventions and removed extra logic for windows path variable name