Testing and cleaner implementation