Cleaned up the .js