Aaaand finally get rid of this ugly line