KISS the code a little