Improvement | remove extra functions