Cleaned duplicate code