Removed repeated conditional check