Narrowed down a lot of over used code