Do some refactor to prevent the garbage stufff