Vishnu/Gopal | #87 | Cleaned up the template file. Also, fixing build.