Code clean up here