Cleaned up naming and JavaScript