Few optomizations