Refactor border property