Cleaned up file and removed from JSLint warnings