Simpler styles and micro optmizations