short the code a bit