Code Refactor + Update tests due to style changes