Polished src code