Made some small code refactorings to reflect the current stage/change of
the project.
Code refactoring