Changes as per best practices

LGTMs
  Jico
  Kevin

Closes #1