Forgot to remove some stuff, and some spaces that was left unintentionally..