Refactor border added