Code: Refactor and minor improvements