Adding a setter and cleanup of utils