Improves code a little bit