Refactor code
Make compilable code.