just a little <3 and cleanup