Small improvements

Added some small improvements that I think makes sense :)