More performance & more readable coding