Make it more nice