Fix compilation errors on the generic branch

Created by: DurgaMa

Fixes #4 (closed)

We can now to run cargo build without any error. It also fixes some formatting issues in the files I've changed.