cleaned code a bit too well