Improving constant lookup and fixing some identations