Code clean up. Looking better