code a bit cleaner