Refactors and additional comments added